widget: move class private data to gtkwidgetprivate.h

We want access to the private data from the action muxer so we can just
move the structures to the gtkwidgetprivate.h header. Alternatively we
could create accessors, but given that we'll probably need to use this
in other areas, seems reasonable to just put it there.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 96e111bfe5107d3991ab92b1c6b2486bc154abd6..e4e610b7e6b3d1cd036f7b5298897cea355e5c8c 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -484,22 +484,6 @@ typedef struct {
   GCallback  callback_symbol;
 } CallbackSymbol;
 
-typedef struct {
-  GBytes               *data;
-  GSList               *children;
-  GtkBuilderScope      *scope;
-} GtkWidgetTemplate;
-
-struct _GtkWidgetClassPrivate
-{
-  GtkWidgetTemplate *template;
-  GType accessible_type;
-  AtkRole accessible_role;
-  GQuark css_name;
-  GType layout_manager_type;
-  GPtrArray *actions;
-};
-
 enum {
   DESTROY,
   SHOW,

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 1018c9c915d0afa867f18f58a35e91c89a2ce758..ecac5558138cbaeb1d8c3060bcc20835917eb8bf 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -201,6 +201,23 @@ struct _GtkWidgetPrivate
   GdkCursor *cursor;
 };
 
+typedef struct
+{
+  GBytes *data;
+  GSList *children;
+  GtkBuilderScope *scope;
+} GtkWidgetTemplate;
+
+struct _GtkWidgetClassPrivate
+{
+  GtkWidgetTemplate *template;
+  GType accessible_type;
+  AtkRole accessible_role;
+  GQuark css_name;
+  GType layout_manager_type;
+  GtkWidgetAction *actions;
+};
+
 void          gtk_widget_root               (GtkWidget *widget);
 void          gtk_widget_unroot             (GtkWidget *widget);
 GtkCssNode *  gtk_widget_get_css_node       (GtkWidget *widget);